From ae3060246a30fbf2b7976a6a4cfe92df884d87ef Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Thu, 19 Aug 2004 20:40:38 +0000 Subject: [PATCH] bitkeeper revision 1.1159.45.4 (41251046RHh_YorMh-pBd-MxpifMww) rename the example config files. --- .rootkeys | 5 +- tools/examples/Makefile | 5 +- tools/examples/xmdefconfig-netbsd | 123 ------------------ tools/examples/{xmdefconfig => xmexample1} | 0 .../{xmdefconfig-example => xmexample2} | 0 tools/python/xen/xm/opts.py | 6 +- 6 files changed, 7 insertions(+), 132 deletions(-) delete mode 100644 tools/examples/xmdefconfig-netbsd rename tools/examples/{xmdefconfig => xmexample1} (100%) rename tools/examples/{xmdefconfig-example => xmexample2} (100%) diff --git a/.rootkeys b/.rootkeys index 59887796f6..6089d9aa83 100644 --- a/.rootkeys +++ b/.rootkeys @@ -268,9 +268,8 @@ 40ee75a9xFz6S05sDKu-JCLqyVTkDA tools/examples/network 40ee75a967sxgcRY4Q7zXoVUaJ4flA tools/examples/vif-bridge 40ee75a93cqxHp6MiYXxxwR5j2_8QQ tools/examples/xend-config.sxp -41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmdefconfig -40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmdefconfig-example -40dfd40auJwNnb8NoiSnRkvZaaXkUg tools/examples/xmdefconfig-netbsd +41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmexample1 +40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmexample2 3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile 3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/libxc/rpm.spec 3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/libxc/xc.h diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 0aa958f685..56a24880f9 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -5,9 +5,8 @@ XEND_INITD = init.d/xend # Xen configuration dir and configs to go there. XEN_CONFIG_DIR = /etc/xen XEN_CONFIGS = xend-config.sxp -XEN_CONFIGS += xmdefconfig -XEN_CONFIGS += xmdefconfig-example -XEN_CONFIGS += xmdefconfig-netbsd +XEN_CONFIGS += xmexample1 +XEN_CONFIGS += xmexample2 # Xen script dir and scripts to go there. XEN_SCRIPT_DIR = /etc/xen/scripts diff --git a/tools/examples/xmdefconfig-netbsd b/tools/examples/xmdefconfig-netbsd deleted file mode 100644 index 8d1662483a..0000000000 --- a/tools/examples/xmdefconfig-netbsd +++ /dev/null @@ -1,123 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Example Python setup script for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# -# This is a relatively advanced script that uses a parameter, vmid, to control -# the settings. So this script can be used to start a set of domains by -# setting the vmid parameter on the 'xm create' command line. For example: -# -# xm create vmid=1 -# xm create vmid=2 -# xm create vmid=3 -# -# The vmid is purely a script variable, and has no effect on the the domain -# id assigned to the new domain. -#============================================================================ - -# Define script variables here. -# xm_vars is defined automatically, use xm_vars.var() to define a variable. - -# This function checks that 'vmid' has been given a valid value. -# It is called automatically by 'xm create'. -def vmid_check(var, val): - val = int(val) - if val <= 0: - raise ValueError - return val - -# Define the 'vmid' variable so that 'xm create' knows about it. -xm_vars.var('vmid', - use="Virtual machine id. Integer greater than 0.", - check=vmid_check) - -# Check the defined variables have valid values.. -xm_vars.check() - -#---------------------------------------------------------------------------- -# Kernel image file. -image = "/boot/netbsd" - -# The domain build function. -builder='netbsd' - -# Initial memory allocation (in megabytes) for the new domain. -memory = 16 - -# A name for the new domain. All domains have to have different names, -# so we use the vmid to create a name. -name = "NETBSD%d" % vmid - -#---------------------------------------------------------------------------- -# Define network interfaces. - -# Number of network interfaces. Default is 1. -#nics=1 - -# Optionally define mac and/or bridge for the network interfaces. -# Random MACs are assigned if not given. -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] - -# Specify IP address(es), for the new domain. You need to -# configure IP addrs within the domain just as you do normally. This -# is just to let Xen know about them so it can route packets -# appropriately. - -#ipaddr = [ xenctl.utils.add_offset_to_ip(xenctl.utils.get_current_ipaddr(),vmid), -# xenctl.utils.add_offset_to_ip('169.254.1.0',vmid), -# ] - -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. - -# This makes the disk device depend on the vmid - assuming -# that devices sda7, sda8 etc. exist. The device is exported -# to all domains as sda1. -# All domains get sda6 read-only (to use for /usr, see below). -disk = [ 'phy:sda%d,sda1,w' % (7+vmid), - 'phy:sda6,sda6,r' ] - -#---------------------------------------------------------------------------- -# Set the kernel command line for the new domain. -# You only need to define the IP parameters and hostname if the domain's -# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. -# You can use 'extra' to set the runlevel and custom environment -# variables used by custom rc scripts (e.g. VMID=, usr= ). - -# Set if you want dhcp to allocate the IP address. -#dhcp="dhcp" -# Set netmask. -#netmask= -# Set default gateway. -#gateway= -# Set the hostname. -#hostname= "vm%d" % vmid - -# Set root device. -root = "/dev/sda1 ro" - -# Root device for nfs. -#root = "/dev/nfs" -# The nfs server. -#nfs_server = '169.254.1.0' -# Root directory on the nfs server. -#nfs_root = '/full/path/to/root/directory' - -# Sets runlevel 4 and the device for /usr. -#extra = "4 VMID=%d usr=/dev/sda6" % vmid -extra = "4 VMID=%d bootdev=xennet0" % vmid - - -#---------------------------------------------------------------------------- -# Set according to whether you want the domain restarted when it exits. -# The default is 'onreboot', which restarts the domain when it shuts down -# with exit code reboot. -# Other values are 'always', and 'never'. -# -#restart = 'onreboot' - -#============================================================================ diff --git a/tools/examples/xmdefconfig b/tools/examples/xmexample1 similarity index 100% rename from tools/examples/xmdefconfig rename to tools/examples/xmexample1 diff --git a/tools/examples/xmdefconfig-example b/tools/examples/xmexample2 similarity index 100% rename from tools/examples/xmdefconfig-example rename to tools/examples/xmexample2 diff --git a/tools/python/xen/xm/opts.py b/tools/python/xen/xm/opts.py index b206d6ce5a..5e7d69a398 100644 --- a/tools/python/xen/xm/opts.py +++ b/tools/python/xen/xm/opts.py @@ -347,7 +347,7 @@ class Opts: def var_usage(self): if self.vars: - print 'The defconfig defines the following variables:' + print 'The config file defines the following variables:' for var in self.vars: var.show() print @@ -372,11 +372,11 @@ class Opts: else: p = self.vals.defconfig if os.path.exists(p): - self.info('Using defconfig file %s.' % p) + self.info('Using config file "%s".' % p) self.load(p, help) break else: - self.err("Cannot open defconfig file %s" % self.vals.defconfig) + self.err('Cannot open config file "%s"' % self.vals.defconfig) def load(self, defconfig, help): """Load a defconfig file. Local variables in the file -- 2.30.2